Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: osd/PeeringState: do not complain about past_intervals constrained by oldest epoch #30222

Merged
merged 1 commit into from Oct 3, 2019

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm added this to the mimic milestone Sep 6, 2019
@smithfarm smithfarm added the core label Sep 6, 2019
Copy link
Member

@neha-ojha neha-ojha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mimic does not have src/osd/PeeringState.cc, let's make that clear by referencing src/osd/PG.cc in the conflicts section

@smithfarm
Copy link
Contributor Author

@neha-ojha Thanks - I somehow neglected to add that comment even though I knew it was needed.

Also there was a make check failure first time around, but I didn't get a chance to look at it - let's see if it happens a second time.

src/osd/PG.cc Outdated Show resolved Hide resolved
… oldest epoch

The start of the required interval has a floor set by the oldest osdmap
epoch we have.  That can lead to an invalid/empty required interval
(because the start is >= the end), but the PG may still have past
intervals.  That can be cause by a slow PG deletion.

No need to complain about this harmless condition.

Fixes: https://tracker.ceph.com/issues/39546
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b139677)

Conflicts:
	src/osd/PeeringState.cc
- file does not exist in mimic; made the changes manually in src/osd/PG.cc
- mimic has a different way of getting the oldest osdmap
@yuriw
Copy link
Contributor

yuriw commented Sep 30, 2019

@yuriw yuriw merged commit 9757d14 into ceph:mimic Oct 3, 2019
@smithfarm smithfarm deleted the wip-41502-mimic branch October 4, 2019 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants